Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Feb 2012 20:29:29 +0000 (12:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Feb 2012 20:29:29 +0000 (12:29 -0800)
commit3828cb72247c19a5f58fc87c7621e26f47b4084d
tree21c0f3351e187fe5412c4a58b68b28bf153077e0
parent96067e3596b124c5fc208b5e1a284c5280c74b74
parenta18fad77116bf7173b4350a3392442cf4a6bf3f7
Merge from trunk.